(x-resolve-font-name): Undo previous change.

diff --git a/lisp/faces.el b/lisp/faces.el
index 5abcd0927c23c18a259e2f0cf7f11a8efde1e160..765ed3f609cdc267bb8ad8e9015f29bd3cf4450f 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -439,9 +439,8 @@ also the same size as FACE on FRAME."
   (and (eq frame t)
        (setq frame nil))
   (if pattern
-      (let ((fonts (x-list-fonts pattern
-                                (if (face-font face) face nil)
-                                frame)))
+      ;; Note that x-list-fonts has code to handle a face with nil as its font.
+      (let ((fonts (x-list-fonts pattern face frame)))
        (or fonts
            (if face
                (error "No fonts matching pattern are the same size as `%s'"